Disable FFmpeg hwaccel when APPIMAGE_BUILD is set #779
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ferdnyc
added
hardware
Codecov Report
@@ Coverage Diff @@
## develop #779 +/- ##
========================================
Coverage 49.02% 49.02%
========================================
Files 183 183
Lines 15683 15683
========================================
Hits 7688 7688
Misses 7995 7995 Continue to review full report at Codecov.
|
|
LGTM! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in OpenShot/openshot-qt#4538, the hwaccel code in FFmpegReader/Writer should be completely disabled, when building for the Linux AppImages. This PR respects the CMake option 'APPIMAGE_BUILD', which we are already setting in the project server builds, and defines the symbol
USE_HW_ACCEL=0for the build. The#ifdefs around the hwaccel code will cause it to be omitted from the compiled classes entirely.Fixes OpenShot/openshot-qt#4538